Produced by Araxis Merge on 2021-07-21 10:22:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/html | head.phtml | 2021-04-23 07:37:20 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/html | head.phtml | 2021-07-02 01:19:00 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 298 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig'); | 2 | $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig'); | |||
| 3 | $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); | 3 | $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); | |||
| 4 | $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart'); | 4 | $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart'); | |||
| 5 | ?> | 5 | ?> | |||
| 6 | <?php //Include Google fonts character subsets (such as extended latin, cyrillic) | 6 | <?php //Include Google fonts character subsets (such as extended latin, cyrillic) | |||
| 7 | $d = $this->getConfig('porto_design'); | 7 | $d = $this->getConfig('porto_design'); | |||
| 8 | $charSubset = ""; | 8 | $charSubset = ""; | |||
| 9 | if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 ) | 9 | if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 ) | |||
| 10 | $charSubset .= ',latin-ext'; | 10 | $charSubset .= ',latin-ext'; | |||
| 11 | if (isset($d['font']['char_subset']) && $d['font']['char_subset']) | 11 | if (isset($d['font']['char_subset']) && $d['font']['char_subset']) | |||
| 12 | $charSubset .= ','.$d['font']['char_subset']; | 12 | $charSubset .= ','.$d['font']['char_subset']; | |||
| 13 | $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic"; | 13 | $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic"; | |||
| 14 | ?> | 14 | ?> | |||
| 15 | <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'): ?> | 15 | <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'): ?> | |||
| 16 | <link rel="stylesheet" href='//fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes; echo $charSubset; ?>' type='text/css' /> | 16 | <link rel="stylesheet" href='//fonts.googleapis.com/css?family=<?php echo str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes; echo $charSubset; ?>' type='text/css' /> | |||
| 17 | <?php else: ?> | 17 | <?php else: ?> | |||
| 18 | <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&v1&subset=latin%2Clatin-ext" type="text/css" media="screen"/> | 18 | <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&v1&subset=latin%2Clatin-ext" type="text/css" media="screen"/> | |||
| 19 | <?php endif;?> | 19 | <?php endif;?> | |||
| 20 | <link href="//fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet"> | 20 | <link href="//fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet"> | |||
| 21 | <link href="//fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet"> | 21 | <link href="//fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet"> | |||
| 22 | <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&v1&subset=latin%2Clatin-ext" type="text/css" media="screen"/> | 22 | <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&v1&subset=latin%2Clatin-ext" type="text/css" media="screen"/> | |||
| 23 | <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?> | 23 | <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?> | |||
| 24 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.min.css'; ?>"> | 24 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.min.css'; ?>"> | |||
| 25 | <?php else: ?> | 25 | <?php else: ?> | |||
| 26 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.optimized.min.css'; ?>"> | 26 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.optimized.min.css'; ?>"> | |||
| 27 | <?php endif; ?> | 27 | <?php endif; ?> | |||
| 28 | <?php if ($this->getConfig('porto_settings/optimization/animate')): ?> | 28 | <?php if ($this->getConfig('porto_settings/optimization/animate')): ?> | |||
| 29 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>"> | 29 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>"> | |||
| 30 | <?php else: ?> | 30 | <?php else: ?> | |||
| 31 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>"> | 31 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>"> | |||
| 32 | <?php endif; ?> | 32 | <?php endif; ?> | |||
| 33 | <?php | 33 | <?php | |||
| 34 | $header_type = $this->getConfig('porto_settings/header/header_type'); | 34 | $header_type = $this->getConfig('porto_settings/header/header_type'); | |||
| 35 | ?> | 35 | ?> | |||
| 36 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.css'; ?>"> | 36 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.css'; ?>"> | |||
| 37 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.css'; ?>"> | 37 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.css'; ?>"> | |||
| 38 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>"> | 38 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>"> | |||
| 39 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>"> | 39 | <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>"> | |||
| 40 | <script type="text/javascript"> | 40 | <script type="text/javascript"> | |||
| 41 | var redirect_cart = false; | 41 | var redirect_cart = false; | |||
| 42 | <?php if($_redirect_cart):?> | 42 | <?php if($_redirect_cart):?> | |||
| 43 | redirect_cart = true; | 43 | redirect_cart = true; | |||
| 44 | <?php endif;?> | 44 | <?php endif;?> | |||
| 45 | var porto_config = { | 45 | var porto_config = { | |||
| 46 | paths: { | 46 | paths: { | |||
| 47 | 'parallax': 'js/jquery.parallax.min', | 47 | 'parallax': 'js/jquery.parallax.min', | |||
| 48 | 'owlcarousel': 'owl.carousel/owl.carousel', | 48 | 'owlcarousel': 'owl.carousel/owl.carousel', | |||
| 49 | 'floatelement': 'js/jquery.floatelement' | 49 | 'floatelement': 'js/jquery.floatelement' | |||
| 50 | }, | 50 | }, | |||
| 51 | shim: { | 51 | shim: { | |||
| 52 | 'owlcarousel': { | 52 | 'owlcarousel': { | |||
| 53 | deps: ['jquery'] | 53 | deps: ['jquery'] | |||
| 54 | }, | 54 | }, | |||
| 55 | 'owlcarousel_thumbs': { | 55 | 'owlcarousel_thumbs': { | |||
| 56 | deps: ['jquery','owlcarousel'] | 56 | deps: ['jquery','owlcarousel'] | |||
| 57 | }, | 57 | }, | |||
| 58 | 'floatelement': { | 58 | 'floatelement': { | |||
| 59 | deps: ['jquery'] | 59 | deps: ['jquery'] | |||
| 60 | } | 60 | } | |||
| 61 | } | 61 | } | |||
| 62 | }; | 62 | }; | |||
| 63 | 63 | |||||
| 64 | require.config(porto_config); | 64 | require.config(porto_config); | |||
| 65 | </script> | 65 | </script> | |||
| 66 | <script type="text/javascript"> | 66 | <script type="text/javascript"> | |||
| 67 | require([ | 67 | require([ | |||
| 68 | 'jquery' | 68 | 'jquery' | |||
| 69 | ], function ($) { | 69 | ], function ($) { | |||
| 70 | <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?> | 70 | <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?> | |||
| 71 | var scrolled = false; | 71 | var scrolled = false; | |||
| 72 | $(window).scroll(function(){ | 72 | $(window).scroll(function(){ | |||
| 73 | if($(window).width()>=992){ | 73 | if($(window).width()>=992){ | |||
| 74 | if(160<$(window).scrollTop() && !scrolled){ | 74 | if(160<$(window).scrollTop() && !scrolled){ | |||
| 75 | $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); | 75 | $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); | |||
| 76 | $('.page-header').addClass("sticky-header"); | 76 | $('.page-header').addClass("sticky-header"); | |||
| 77 | scrolled = true; | 77 | scrolled = true; | |||
| 78 | if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { | 78 | if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { | |||
| 79 | $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>'); | 79 | $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>'); | |||
| 80 | var minicart = $('.page-header .minicart-wrapper').detach(); | 80 | var minicart = $('.page-header .minicart-wrapper').detach(); | |||
| 81 | $('.page-header .navigation').append(minicart); | 81 | $('.page-header .navigation').append(minicart); | |||
| 82 | 82 | |||||
| 83 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | 83 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | |||
| 84 | var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html(); | 84 | var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html(); | |||
| 85 | $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>'); | 85 | $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>'); | |||
| 86 | <?php endif; ?> | 86 | <?php endif; ?> | |||
| 87 | } | 87 | } | |||
| 88 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | 88 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | |||
| 89 | <?php | 89 | <?php | |||
| 90 | if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){ | 90 | if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){ | |||
| 91 | $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR; | 91 | $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR; | |||
| 92 | $path = $folderName . '/' . $logo_src; | 92 | $path = $folderName . '/' . $logo_src; | |||
| 93 | $imageUrl = $porto_helper->getBaseUrl() . $path; | 93 | $imageUrl = $porto_helper->getBaseUrl() . $path; | |||
| 94 | ?> | 94 | ?> | |||
| 95 | $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>"); | 95 | $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>"); | |||
| 96 | <?php | 96 | <?php | |||
| 97 | } | 97 | } | |||
| 98 | ?> | 98 | ?> | |||
| 99 | <?php endif; ?> | 99 | <?php endif; ?> | |||
| 100 | }126 | 100 | } | |||
| 101 | if(160>=$(window).scrollTop() && scrolled){ | 101 | if(160>=$(window).scrollTop() && scrolled){ | |||
| 102 | $('.page-header.sticky-header').css("height",'auto'); | 102 | $('.page-header.sticky-header').css("height",'auto'); | |||
| 103 | $('.page-header').removeClass("sticky-header"); | 103 | $('.page-header').removeClass("sticky-header"); | |||
| 104 | scrolled = false; | 104 | scrolled = false; | |||
| 105 | if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { | 105 | if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { | |||
| 106 | var minicart; | 106 | var minicart; | |||
| 107 | minicart = $('.page-header .navigation .minicart-wrapper').detach(); | 107 | minicart = $('.page-header .navigation .minicart-wrapper').detach(); | |||
| 108 | $('.minicart-place').after(minicart); | 108 | $('.minicart-place').after(minicart); | |||
| 109 | $('.minicart-place').remove(); | 109 | $('.minicart-place').remove(); | |||
| 110 | $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); | 110 | $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); | |||
| 111 | 111 | |||||
| 112 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | 112 | <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> | |||
| 113 | $('.page-header .navigation > .sticky-logo').remove(); | 113 | $('.page-header .navigation > .sticky-logo').remove(); | |||
| 114 | <?php endif; ?> | 114 | <?php endif; ?> | |||
| 115 | } | 115 | } | |||
| 116 | } | 116 | } | |||
| 117 | } | 117 | } | |||
| 118 | if($('body').hasClass('mobile-sticky')) { | 118 | if($('body').hasClass('mobile-sticky')) { | |||
| 119 | if($(window).width()<=991){ | 119 | if($(window).width()<=991){ | |||
| 120 | if(130<$(window).scrollTop() && !scrolled){ | 120 | if(130<$(window).scrollTop() && !scrolled){ | |||
| 121 | $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); | 121 | $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); | |||
| 122 | $('.page-header').addClass("sticky-header"); | 122 | $('.page-header').addClass("sticky-header"); | |||
| 123 | scrolled = true; | 123 | scrolled = true; | |||
| 124 | } | 124 | } | |||
| 125 | if(130>=$(window).scrollTop() && scrolled){ | 125 | if(130>=$(window).scrollTop() && scrolled){ | |||
| 126 | $('.page-header.sticky-header').css("height",'auto'); | 126 | $('.page-header.sticky-header').css("height",'auto'); | |||
| 127 | $('.page-header').removeClass("sticky-header"); | 127 | $('.page-header').removeClass("sticky-header"); | |||
| 128 | scrolled = false; | 128 | scrolled = false; | |||
| 129 | } | 129 | } | |||
| 130 | } | 130 | } | |||
| 131 | } | 131 | } | |||
| 132 | }); | 132 | }); | |||
| 133 | $(window).resize(function(){ | 133 | $(window).resize(function(){ | |||
| 134 | var b_w = $(window).width(); | 134 | var b_w = $(window).width(); | |||
| 135 | if(b_w <= 991){ | 135 | if(b_w <= 991){ | |||
| 136 | if($('.page-header .navigation .minicart-wrapper').length > 0) { | 136 | if($('.page-header .navigation .minicart-wrapper').length > 0) { | |||
| 137 | var minicart; | 137 | var minicart; | |||
| 138 | minicart = $('.page-header .navigation .minicart-wrapper').detach(); | 138 | minicart = $('.page-header .navigation .minicart-wrapper').detach(); | |||
| 139 | $('.minicart-place').after(minicart); | 139 | $('.minicart-place').after(minicart); | |||
| 140 | $('.minicart-place').remove(); | 140 | $('.minicart-place').remove(); | |||
| 141 | $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); | 141 | $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); | |||
| 142 | } | 142 | } | |||
| 143 | } | 143 | } | |||
| 144 | }); | 144 | }); | |||
| 145 | <?php endif; ?> | 145 | <?php endif; ?> | |||
| 146 | }); | 146 | }); | |||
| 147 | </script> | 147 | </script> | |||
| 148 | <?php if($this->getConfig('porto_settings/general/smartlayers')): ?> | 148 | <?php if($this->getConfig('porto_settings/general/smartlayers')): ?> | |||
| 149 | <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script> | 149 | <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script> | |||
| 150 | <?php endif; ?> | 150 | <?php endif; ?> |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.